From 2ef06f389699163cfd58c1cff3743a1fc0dfb8bd Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Sun, 18 Nov 2018 21:36:29 +0000 Subject: [PATCH] nonlinux_utime Gbp-Pq: Name nonlinux_utime.diff --- qmake/library/ioutils.cpp | 2 +- src/corelib/io/qfilesystemengine_unix.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qmake/library/ioutils.cpp b/qmake/library/ioutils.cpp index fd84dff59..3db298a24 100644 --- a/qmake/library/ioutils.cpp +++ b/qmake/library/ioutils.cpp @@ -222,7 +222,7 @@ bool IoUtils::touchFile(const QString &targetFileName, const QString &referenceF *errorString = fL1S("Cannot stat() reference file %1: %2.").arg(referenceFileName, fL1S(strerror(errno))); return false; } -# if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L +# if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L && defined(UTIME_NOW) const struct timespec times[2] = { { 0, UTIME_NOW }, st.st_mtim }; const bool utimeError = utimensat(AT_FDCWD, targetFileName.toLocal8Bit().constData(), times, 0) < 0; # else diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index deb4a9f22..5afe47008 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -1439,7 +1439,7 @@ bool QFileSystemEngine::setFileTime(int fd, const QDateTime &newDate, QAbstractF return false; } -#if QT_CONFIG(futimens) +#if QT_CONFIG(futimens) && defined(UTIME_OMIT) struct timespec ts[2]; ts[0].tv_sec = ts[1].tv_sec = 0; -- 2.30.2